From 1056e9976ad2a7dd99c692097ed349bf6dfa8299 Mon Sep 17 00:00:00 2001
From: Alex Monday <monday15@gmx.com>
Date: Thu, 27 Jun 2019 10:40:22 +0200
Subject: [PATCH] Adwaita: Apply border-radius to .csd popovers

Fix popover_radius variable doesn't apply to .csd popover.

Closes https://gitlab.gnome.org/GNOME/gtk/issues/1984
---
 gtk/theme/Adwaita/_common.scss           | 8 ++++++--
 gtk/theme/Adwaita/gtk-contained-dark.css | 4 ++--
 gtk/theme/Adwaita/gtk-contained.css      | 4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index a6a78f9fb2..49144ed31d 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -9,6 +9,7 @@ $button_transition: all 200ms $ease-out-quad;
 $button_radius: 5px;
 $menu_radius: 5px;
 $window_radius: $button_radius + 3;
+$popover_radius: $button_radius + 4;
 
 * {
   padding: 0;
@@ -2175,10 +2176,13 @@ popover>contents {
 }
 
 popover>contents.background {
-  border-radius: $menu_radius + 4px;
+
   background-color: $popover_bg_color;
   box-shadow: 0 1px 2px transparentize(black, 0.7);
-  .csd &, & { border: 1px solid $borders_color; }
+  .csd &, & { 
+    border: 1px solid $borders_color;
+    border-radius: $popover_radius;
+  }
 
   &:backdrop {
     background-color: $backdrop_bg_color;
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 2fd48b6d70..f417451c56 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -875,9 +875,9 @@ popover.menu > arrow, popover > arrow { background-color: #353535; border: 1px s
 
 popover > contents { padding: 8px; background-color: #353535; border: 1px solid #1b1b1b; margin: 0px; }
 
-popover > contents.background { border-radius: 9px; background-color: #353535; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3); }
+popover > contents.background { background-color: #353535; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3); }
 
-.csd popover > contents.background, popover > contents.background { border: 1px solid #1b1b1b; }
+.csd popover > contents.background, popover > contents.background { border: 1px solid #1b1b1b; border-radius: 9px; }
 
 popover > contents.background:backdrop { background-color: #353535; box-shadow: none; }
 
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 5e0fc9dee9..0a547caf33 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -883,9 +883,9 @@ popover.menu > arrow, popover > arrow { background-color: #f6f5f4; border: 1px s
 
 popover > contents { padding: 8px; background-color: #f6f5f4; border: 1px solid #cdc7c2; margin: 0px; }
 
-popover > contents.background { border-radius: 9px; background-color: #f6f5f4; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3); }
+popover > contents.background { background-color: #f6f5f4; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3); }
 
-.csd popover > contents.background, popover > contents.background { border: 1px solid #cdc7c2; }
+.csd popover > contents.background, popover > contents.background { border: 1px solid #cdc7c2; border-radius: 9px; }
 
 popover > contents.background:backdrop { background-color: #f6f5f4; box-shadow: none; }
 
-- 
2.30.2